@@ -52,10 +52,9 @@ def delete_branch_campus(request): |
||
52 | 52 |
|
53 | 53 |
try: |
54 | 54 |
campus = BranchCampusInfo.objects.get(id=campus_id) |
55 |
- except: |
|
55 |
+ except BranchCampusInfo.DoesNotExist: |
|
56 | 56 |
return response() |
57 | 57 |
|
58 |
- |
|
59 | 58 |
if campus.campus_type == BranchCampusInfo.MAIN: |
60 | 59 |
return response(40001, '', '总院不可删除') |
61 | 60 |
|
@@ -6,7 +6,8 @@ from django_query import get_query_value |
||
6 | 6 |
from django_response import response |
7 | 7 |
from paginator import pagination |
8 | 8 |
|
9 |
-from registration.models import BranchCampusAdministratorInfo, CourseInfo, CourseRegisterFieldInfo, CourseRegisterInfo, BranchCampusInfo |
|
9 |
+from registration.models import (BranchCampusAdministratorInfo, BranchCampusInfo, CourseInfo, CourseRegisterFieldInfo, |
|
10 |
+ CourseRegisterInfo) |
|
10 | 11 |
|
11 | 12 |
|
12 | 13 |
def add_course(request): |
@@ -79,7 +80,6 @@ def get_course_list(request): |
||
79 | 80 |
admin = BranchCampusAdministratorInfo.objects.get(admin_id=admin_id, user_status=BranchCampusAdministratorInfo.ACTIVATED) |
80 | 81 |
except BranchCampusAdministratorInfo.DoesNotExist: |
81 | 82 |
admin = None |
82 |
- |
|
83 | 83 |
|
84 | 84 |
courses = CourseInfo.objects.filter(status=True) |
85 | 85 |
if admin and admin.data.get('campus_type', BranchCampusInfo.BRANCH) == BranchCampusInfo.BRANCH: |